Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gunsmithing! #2664

Closed
wants to merge 66 commits into from
Closed

Gunsmithing! #2664

wants to merge 66 commits into from

Conversation

FalloutFalcon
Copy link
Member

@FalloutFalcon FalloutFalcon commented Jan 25, 2024 •
edited
Loading

About The Pull Request

OK extreme work in progress but I want checks to run. Will iron out the pr description when I have some more to show.
Prone to change https://hackmd.io/@FalloutFalcon/HkX_Wqc9p
https://discord.com/channels/837744059291533392/1195492151967100988/1195494569421324319

2024-01-24.19-57-56.mp4

Why It's Good For The Game

Changelog

🆑
add: Gunsmithing!
/:cl:

@github-actions github-actions bot added DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Jan 25, 2024
@Zorazi-Teo-Daedalus
Copy link

I want this to exist so badly, in part because it would lay the groundwork for a Hunter's Pride ship for SRM so they can finally have more than one ship.

Would it also be possible as a later goal, maybe even a separate PR, to make the manufacture of ammunition also a thing? It feels like something that would go hand in hand with gunsmithing to also produce gunpowder and craft ammunition instead of say, buying it from cargo or printing it from a lathe.

@FalloutFalcon
Copy link
Member Author

FalloutFalcon commented Jan 30, 2024 •
edited
Loading

I want this to exist so badly, in part because it would lay the groundwork for a Hunter's Pride ship for SRM so they can finally have more than one ship.

Would it also be possible as a later goal, maybe even a separate PR, to make the manufacture of ammunition also a thing? It feels like something that would go hand in hand with gunsmithing to also produce gunpowder and craft ammunition instead of say, buying it from cargo or printing it from a lathe.

Ammo crafting is a planned part of this pr

@Zorazi-Teo-Daedalus
Copy link

Zorazi-Teo-Daedalus commented Jan 30, 2024 •
edited
Loading

I want this to exist so badly, in part because it would lay the groundwork for a Hunter's Pride ship for SRM so they can finally have more than one ship.
Would it also be possible as a later goal, maybe even a separate PR, to make the manufacture of ammunition also a thing? It feels like something that would go hand in hand with gunsmithing to also produce gunpowder and craft ammunition instead of say, buying it from cargo or printing it from a lathe.

Ammo crafting is a planned part of this pr

That awkward moment when someone is a dumbass and doesn't read the design document before commenting. (It's me, I'm the dumbass.)

Can't wait for people to start making like, Metro 2033 abominations.

@FalloutFalcon
Copy link
Member Author

I want this to exist so badly, in part because it would lay the groundwork for a Hunter's Pride ship for SRM so they can finally have more than one ship.

Would it also be possible as a later goal, maybe even a separate PR, to make the manufacture of ammunition also a thing? It feels like something that would go hand in hand with gunsmithing to also produce gunpowder and craft ammunition instead of say, buying it from cargo or printing it from a lathe.

Ammo crafting is a planned part of this pr

That awkward moment when someone is a dumbass and doesn't read the design document before commenting. (It's me, I'm the dumbass.)

Can't wait for people to start making like, Metro 2033 abominations.

I think i'm going to scale back customization aloft for this pr
I might have a later pr for custom guns but they will prob be there own thing

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Mar 9, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 9, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Merge Conflict Use Git Hooks, you're welcome. and removed Merge Conflict Use Git Hooks, you're welcome. labels Mar 21, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed Merge Conflict Use Git Hooks, you're welcome. Map Change Tile placing is hard. Thank you for your service. labels Apr 2, 2024
This was referenced Apr 4, 2024
Closed
Merged
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Apr 8, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Apr 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@FalloutFalcon
Copy link
Member Author

Gonna close this. I plan on rewriting, alot of it, gonna wait till some other gun stuff happens

github-merge-queue bot pushed a commit that referenced this pull request Jun 7, 2024
@FalloutFalcon @Sun-Soaked
Removes magic stuff adjacent to gun/magic (#2877)
bb10642 
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
This was MEANT to be a pr were i was tackling gun cruft but magic
accounts for a large portion of the line count.

Pulls from #2664 (minus the actual gun crafting) and #2702 

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Cruft

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: Removed alot of magic cruft
code: Sorts gun defines into there own file
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: FalloutFalcon <[email protected]>
Co-authored-by: Sun-Soaked <[email protected]>
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Jun 22, 2024
@FalloutFalcon @Sun-Soaked @MrCat15352
Removes magic stuff adjacent to gun/magic (shiptest-ss13#2877)
b349787 
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

This was MEANT to be a pr were i was tackling gun cruft but magic
accounts for a large portion of the line count.

Pulls from shiptest-ss13#2664 (minus the actual gun crafting) and shiptest-ss13#2702

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Cruft

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl:
del: Removed alot of magic cruft
code: Sorts gun defines into there own file
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: FalloutFalcon <[email protected]>
Co-authored-by: Sun-Soaked <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Code change Watch something violently break. DME Edit Merge Conflict Use Git Hooks, you're welcome. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FalloutFalcon @Zorazi-Teo-Daedalus